From 24544e6113f31dc142c74e9880b8ed788d60020a Mon Sep 17 00:00:00 2001 From: =?utf8?q?IOhannes=20m=20zm=C3=B6lnig?= Date: Wed, 10 Feb 2016 16:46:25 +0100 Subject: [PATCH] simplified the no z-types patch a single define! --- debian/patches/no-ztypes.patch | 39 ++++++---------------------------- 1 file changed, 7 insertions(+), 32 deletions(-) diff --git a/debian/patches/no-ztypes.patch b/debian/patches/no-ztypes.patch index a0b2aff3..e64067cc 100644 --- a/debian/patches/no-ztypes.patch +++ b/debian/patches/no-ztypes.patch @@ -5,38 +5,13 @@ Author: IOhannes m zmölnig Last-Update: 2015-01-21 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- juce.orig/modules/juce_core/zip/juce_GZIPCompressorOutputStream.cpp -+++ juce/modules/juce_core/zip/juce_GZIPCompressorOutputStream.cpp -@@ -87,8 +87,8 @@ - { - stream.next_in = const_cast (data); - stream.next_out = buffer; -- stream.avail_in = (z_uInt) dataSize; -- stream.avail_out = (z_uInt) sizeof (buffer); -+ stream.avail_in = (uInt) dataSize; -+ stream.avail_out = (uInt) sizeof (buffer); - - const int result = isFirstDeflate ? deflateParams (&stream, compLevel, strategy) - : deflate (&stream, flushMode); --- juce.orig/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp +++ juce/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp -@@ -126,8 +126,8 @@ - { - stream.next_in = data; - stream.next_out = dest; -- stream.avail_in = (z_uInt) dataSize; -- stream.avail_out = (z_uInt) destSize; -+ stream.avail_in = (uInt) dataSize; -+ stream.avail_out = (uInt) destSize; - - switch (inflate (&stream, Z_PARTIAL_FLUSH)) - { -@@ -136,7 +136,7 @@ - // deliberate fall-through - case Z_OK: - data += dataSize - stream.avail_in; -- dataSize = (z_uInt) stream.avail_in; -+ dataSize = (uInt) stream.avail_in; - return (int) (destSize - stream.avail_out); +@@ -77,6 +77,7 @@ + #endif + #else + #include JUCE_ZLIB_INCLUDE_PATH ++ #define z_uInt uInt + #endif + } - case Z_NEED_DICT: -- 2.30.2